JSON lib: parse and pack blinded messageHEADmaster

3 files changed, 226 insertions, 0 deletions

diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h
index 0b6b299d1..44dbf8965 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -430,6 +430,17 @@ GNUNET_JSON_spec_rsa_signature (const char *name,
                                 struct GNUNET_CRYPTO_RsaSignature **sig);
 
 
+/**
+ * Specification for parsing a blinded message.
+ *
+ * @param name name of the JSON field
+ * @param sig where to store the blinded message found under @a name
+ */
+struct GNUNET_JSON_Specification
+GNUNET_JSON_spec_blinded_message (const char *name,
+                                  struct GNUNET_CRYPTO_BlindedMessage **msg);
+
+
 /* ****************** Generic generator interface ******************* */
 
 
@@ -979,6 +990,19 @@ GNUNET_JSON_pack_unblinded_signature (const char *name,
                                       const struct GNUNET_CRYPTO_UnblindedSignature *sig);
 
 
+/**
+ * Generate packer instruction for a JSON field of type
+ * blinded message.
+ *
+ * @param name name of the field to add to the object
+ * @param msg blinded message
+ * @return json pack specification
+ */
+struct GNUNET_JSON_PackSpec
+GNUNET_JSON_pack_blinded_message (const char *name,
+                                  const struct GNUNET_CRYPTO_BlindedMessage *msg);
+
+
 #endif
 
 /* end of gnunet_json_lib.h */
diff --git a/src/lib/json/json_helper.c b/src/lib/json/json_helper.c
index b6965e080..cae26aef4 100644
--- a/src/lib/json/json_helper.c
+++ b/src/lib/json/json_helper.c
@@ -26,6 +26,7 @@
  */
 #include "platform.h"
 #include "gnunet_json_lib.h"
+#include <gnunet/gnunet_common.h>
 
 
 struct GNUNET_JSON_Specification
@@ -42,6 +43,29 @@ GNUNET_JSON_spec_end ()
 
 
 /**
+ * Convert string value to numeric cipher value.
+ *
+ * @param cipher_s input string
+ * @return numeric cipher value
+ */
+static enum GNUNET_CRYPTO_BlindSignatureAlgorithm
+string_to_cipher (const char *cipher_s)
+{
+  if ((0 == strcasecmp (cipher_s,
+                        "RSA")) ||
+      (0 == strcasecmp (cipher_s,
+                        "RSA+age_restricted")))
+    return GNUNET_CRYPTO_BSA_RSA;
+  if ((0 == strcasecmp (cipher_s,
+                        "CS")) ||
+      (0 == strcasecmp (cipher_s,
+                        "CS+age_restricted")))
+    return GNUNET_CRYPTO_BSA_CS;
+  return GNUNET_CRYPTO_BSA_INVALID;
+}
+
+
+/**
  * Parse given JSON object to fixed size data
  *
  * @param cls closure, NULL
@@ -1180,4 +1204,142 @@ GNUNET_JSON_spec_boolean (const char *name,
 }
 
 
+/**
+ * Parse given JSON object to a blinded message.
+ *
+ * @param cls closure, NULL
+ * @param root the json object representing data
+ * @param[out] spec where to write the data
+ * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
+ */
+static enum GNUNET_GenericReturnValue
+parse_blinded_message (void *cls,
+                       json_t *root,
+                       struct GNUNET_JSON_Specification *spec)
+{
+  struct GNUNET_CRYPTO_BlindedMessage **target = spec->ptr;
+  struct GNUNET_CRYPTO_BlindedMessage *blinded_message;
+  const char *cipher;
+  struct GNUNET_JSON_Specification dspec[] = {
+    GNUNET_JSON_spec_string ("cipher",
+                             &cipher),
+    GNUNET_JSON_spec_end ()
+  };
+  const char *emsg;
+  unsigned int eline;
+
+  (void) cls;
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (root,
+                         dspec,
+                         &emsg,
+                         &eline))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  blinded_message = GNUNET_new (struct GNUNET_CRYPTO_BlindedMessage);
+  blinded_message->rc = 1;
+  blinded_message->cipher = string_to_cipher (cipher);
+  switch (blinded_message->cipher)
+  {
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
+    {
+      struct GNUNET_JSON_Specification ispec[] = {
+        GNUNET_JSON_spec_varsize (
+          "rsa_blinded_planchet",
+          &blinded_message->details.rsa_blinded_message.blinded_msg,
+          &blinded_message->details.rsa_blinded_message.blinded_msg_size),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (root,
+                             ispec,
+                             &emsg,
+                             &eline))
+      {
+        GNUNET_break_op (0);
+        GNUNET_free (blinded_message);
+        return GNUNET_SYSERR;
+      }
+      *target = blinded_message;
+      return GNUNET_OK;
+    }
+  case GNUNET_CRYPTO_BSA_CS:
+    {
+      struct GNUNET_JSON_Specification ispec[] = {
+        GNUNET_JSON_spec_fixed_auto (
+          "cs_nonce",
+          &blinded_message->details.cs_blinded_message.nonce),
+        GNUNET_JSON_spec_fixed_auto (
+          "cs_blinded_c0",
+          &blinded_message->details.cs_blinded_message.c[0]),
+        GNUNET_JSON_spec_fixed_auto (
+          "cs_blinded_c1",
+          &blinded_message->details.cs_blinded_message.c[1]),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (root,
+                             ispec,
+                             &emsg,
+                             &eline))
+      {
+        GNUNET_break_op (0);
+        GNUNET_free (blinded_message);
+        return GNUNET_SYSERR;
+      }
+      *target = blinded_message;
+      return GNUNET_OK;
+    }
+  }
+  GNUNET_break_op (0);
+  GNUNET_free (blinded_message);
+  return GNUNET_SYSERR;
+}
+
+/**
+ * Cleanup data left from parsing blinded message.
+ *
+ * @param cls closure, NULL
+ * @param[out] spec where to free the data
+ */
+static void
+clean_blinded_message (void *cls,
+                       struct GNUNET_JSON_Specification *spec)
+{
+  struct GNUNET_CRYPTO_BlindedMessage **blinded_message = spec->ptr;
+
+  (void) cls;
+  if (NULL != blinded_message)
+  {
+    GNUNET_CRYPTO_blinded_message_decref (*blinded_message);
+    *blinded_message = NULL;
+  }
+}
+
+
+struct GNUNET_JSON_Specification
+GNUNET_JSON_spec_blinded_message (const char *name,
+                                  struct GNUNET_CRYPTO_BlindedMessage **msg)
+{
+  struct GNUNET_JSON_Specification ret = {
+    .parser = &parse_blinded_message,
+    .cleaner = &clean_blinded_message,
+    .cls = NULL,
+    .field = name,
+    .ptr = msg,
+    .ptr_size = 0,
+    .size_ptr = NULL
+  };
+
+  *msg = NULL;
+  return ret;
+}
+
+
 /* end of json_helper.c */
diff --git a/src/lib/json/json_pack.c b/src/lib/json/json_pack.c
index f7c8a0b86..7b41a967e 100644
--- a/src/lib/json/json_pack.c
+++ b/src/lib/json/json_pack.c
@@ -400,4 +400,44 @@ GNUNET_JSON_pack_unblinded_signature (const char *name,
 }
 
 
+struct GNUNET_JSON_PackSpec
+GNUNET_JSON_pack_blinded_message (const char *name,
+                                  const struct GNUNET_CRYPTO_BlindedMessage *msg)
+{
+  struct GNUNET_JSON_PackSpec ps = {
+    .field_name = name,
+  };
+
+  switch (msg->cipher)
+  {
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
+    ps.object = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_string ("cipher",
+                               "RSA"),
+      GNUNET_JSON_pack_data_varsize (
+        "rsa_blinded_planchet",
+        msg->details.rsa_blinded_message.blinded_msg,
+        msg->details.rsa_blinded_message.blinded_msg_size));
+    return ps;
+  case GNUNET_CRYPTO_BSA_CS:
+    ps.object = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_string ("cipher",
+                               "CS"),
+      GNUNET_JSON_pack_data_auto (
+        "cs_nonce",
+        &msg->details.cs_blinded_message.nonce),
+      GNUNET_JSON_pack_data_auto (
+        "cs_blinded_c0",
+        &msg->details.cs_blinded_message.c[0]),
+      GNUNET_JSON_pack_data_auto (
+        "cs_blinded_c1",
+        &msg->details.cs_blinded_message.c[1]));
+    return ps;
+  }
+  GNUNET_assert (0);
+  return ps;
+}
+
 /* end of json_pack.c */